Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Update loopback.js #666

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

jackzelenkin
Copy link

Description
On a Mac, loopbackAnswer contains \r\n characters instead of proper line breaks. Because of that initial regex /a=crypto:[1-9]+ .*/g matches everything starting from a=crypto:1 and all the way to the end of loopbackAnswer, and when replaced for an empty string it corrupts the json.

Solution
As a solution, I propose to first search-and-replace "mac-specific" crypto patterns (crypto all the way to first \r\n sequence) and only after that search-and-replace original patterns (crypto all the way to the end of the line).

On a mac loopbackAnswer contains \\r\\n characters instead of proper line breaks. Because of that initial regex /a=crypto:[1-9]+ .*/g matches everything starting from a=crypto:1 all the way to the end of loopbackAnswer, and when replaced for an empty string it corrupts the json. 

As a solution, I propose to first search-and-replace "mac-specific" crypto patterns (crypto all the way to first \\r\\n sequence) and only after that search-and-replace original patterns (crypto all the way to the end of the line).
@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@jackzelenkin
Copy link
Author

@googlebot I signed it!

@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@alvestrand
Copy link
Contributor

Wrong fix, I think.
\r\n is the specified line termination character in SDP, \n is exceptionally (but universally) accepted.
@fippo should look at this - either the pattern leaves a blank line (just the \r\n or \n), or it eats the \n when there's no \r and doesn't eat it when it's present.
I think you need extra regex modifiers to get substitutes to work past linebreaks (of any type).

@fippo fippo mentioned this pull request Jun 17, 2020
@fippo
Copy link
Contributor

fippo commented Jun 17, 2020

The code takes loopbackAnswer as wssMessage.msg which is the serialized JSON which escapes all the SDP crlfs as \r\n. That is a bit silly and unexpected...
And yes, the pattern leaves blank lines, thank you! #667 should fix both

@jackzelenkin
Copy link
Author

Thanks Philipp!

MirkoBonadei pushed a commit that referenced this pull request Jun 18, 2020
see comments in #666, #657 was wrong
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants